Cleaned up a bit. More cleaning coming soon