Cleaned up the code base, bawse