Implemented Ayberk's review. Thanks a lot!