fixed some inconsistencies, formatting