Cleanup commented code and rouded line caps