Removed Long Method as suggested by JDeoderant