Cleaned up comments and code, utilized null type for uninitialized values