Cleaned up code

Cleaned up the code, still not synthesizing.