cleaned tainted class and added comments