Cleaned up code little bit.