Cleaned up and added/updated comments