Removed redundant methods and added some logging