Cleaned up closes #11