fixed align tier
some cleaning