removed cs coding / optimized code