just some cleaner code