Removed repetations of procedures