Bugfix
Code cleanup