Removed some debugging code to improve readability