Cleaned code
Authored by: miguelnunes 2014-07-04
Parent(s): [58e91d]
Child(ren): [46b585][95d704][ea2864]