Cleaned up code base. Hopefully.