Code cleanup (no functional changes)
Cleaned up project