Cleaned up compiler