User code clear up
Merge pull request #559 from sexnothing/user

User code clear up