Code cleanup and ease readability