cleaned up code and pulled out method into a helper
deleted unused file