Cleaned up a bit. Resolved #1