Just some general suggestions for code cleanup