Refactor, cleaner code :-)