Cleaned-up the codebase