Fixed the output and now the program works as expected. Just need to beautiful things a bit
Final cleaning up the code touches