JuozasK Minor cleanup and comments