Cleaned up and restructured a bit