Cleanup; Improve readability