readability and bug fixes etc. :)