Readability and cleanup