Fix my sucky coding