Fix/cleanup project

Minor cleanup.