made code cleaner