cleaned up little bit