Minor improvements, and removes some lines

Also improve code normalization