code cleaning | more code