Cleaned up code - <Bala>