Clean up & coding style enforcement