Clean up a little bit
Clean up little bit