Just some coding cleanup