Some minor stetic changes to keep the code clean