Clean up IndentGenerator code