cleaned up code further