Unstable

Style review to make everything look nice.