removed comments and redundant code