Made some changes to get cleaner code.