Addressed comments and further cleanups