Cleaned up for pull-request