Light code refactoring ;)