removed comments and cleanup