removed comments and general cleanup.