[ENHANCEMENT] Even more code cleanup + title &amp; bugfix