Cleanded up Code