Cleaned up code and fixed vahaksucks