Cleaned up compiling code a little