Introduced some changes based on rakyll suggestions