Minor updates to code

Nothing too important, just some changes and edits