Fix

Minor updates to make the code better looking :)