Removed relocated code and added tags to my own code.