Small Changes regarding style