Made some changes for personal preference