Fixed formatting
Added make component functions