Minor edits
Implemented expando, fixed some styles
Refactored expando