Cleaned up code little bit more