some cleanup with indendation and stuff