cleaned up code in all files. Will add req tags next