Cleaned up the codbase