Fixed suggestions made by wizjany