Clean up tomcat script a bit