ugly code

removed ugly code part