remove ugly code issues