general optimization
updated to fullfill mmolina/sun/oracle recomendations
Merge pull request #1 from msesma/task/optimize

general optimization