fixing heroku compile issue
code cleanup 2
code cleanup 3