Cleaning up
Updated to match README