Refactoring and addressing a few issues