More cleaner code