Make it more uniform

Signed-off-by: Suki <suki@missallsunday.com>
...and finish the job before doing a commit :P

Signed-off-by: Suki <suki@missallsunday.com>
we don't need what we don't need anymore :P

Signed-off-by: Suki <suki@missallsunday.com>