Refactor

Small syntax clean up regarding bracket location for best practices