completed uncleaned code

completed uncleaned code