Trying to compile, cleaned up things