Clean up code. Regular commit