[TASK] Cleanup, respect coding guidelines etc.