switched to correct ami
Improved tomcat service management
Cleaned code according foodcritic test