Resolved warnings of implicit conversion. Also improved spacing to be consistent through code.