Improved Readability a bit