Code clean-up, increased readability of code