refactoring : source
minor bugfix : output css