fixed indentation issues + cleaned up code
fixed indentation issues + cleaned up code

runqingz/umple,ahmedvc/umple,runqingz/umple,runqingz/umple,ahmedvc/umple,ahmedvc/umple,umple/umple,umple/umple,runqingz/umple,umple/umple,runqingz/umple,runqingz/umple,ahmedvc/umple,umple/umple,umple/umple,runqingz/umple,umple/umple,ahmedvc/umple,ahmedvc/umple,ahmedvc/umple,umple/umple,umple/umple