Finished cleaning up. Closes #1