Some cleanup regarding readability and DocComments