username fixed + some code reformating