Cleanup. Added everything in compiler to it's own method