Starting massive code cleanup!