Just cleaned up code